*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index badacc6721461086ae04a8097e930ec39af16f2d..9f916d8a5059b17264b42ba2cd9efc217a162d18 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-21  Kim F. Storm  <storm@cua.dk>
+
+       * simple.el (line-move-1): Check for move-end-of-line instead of
+       end-of-line when setting temporary-goal-column.
+
 2006-06-21  Miles Bader  <miles@gnu.org>
 
        * play/cookie1.el (cookie): Work properly when there's only one entry.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0decd0099fe97c7c3a5bc83bcb3f3e7456acc667..be859a9b83471a5b1889b6184b57b56a648f685c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-21  Kim F. Storm  <storm@cua.dk>
+
+       * dispextern.h (struct it): Add `position' member to iterator stack.
+       Rename `pos' member to `current'.  Rearrange and add comments.
+
+       * xdisp.c (handle_stop): Set it->ignore_overlay_strings_at_pos_p
+       if  we get any overlays.
+       (set_cursor_from_row): Don't clobber `end' if we rescan from
+       start_string.
+       (push_it, pop_it): Save it->position.
+
 2006-06-19  Richard Stallman  <rms@gnu.org>
 
        * window.c (size_window): New arg FIRST_ONLY.  All callers changed.